<<<<<<< HEAD
/***************common style***************/
*{
    margin:0;
    padding:0;
}
li{
    list-style: none;
}
a{
    text-decoration: none;
}
.clear{
    clear: both;
}
/***************common style***************/
/***************main style***************/
main{
    width:100%;
    height:800px;
    background:#fffbf4;
}
.so{
    width:100%;
    height:40px;
}
main .button{
    width:60px;
    height:40px;
    float:left;
    text-align:center;
    line-height:40px;
    background:orange;
}
main .button p{
    color:white;
}
main .all{
    width:100%;
    height:500px;
    margin-top:10px;
}
main .all li{
    margin-bottom:4px;
}
/***************main style***************/
=======
/***************common style***************/
*{
    margin:0;
    padding:0;
}
li{
    list-style: none;
}
a{
    text-decoration: none;
}
.clear{
    clear: both;
}
/***************common style***************/
/***************main style***************/
main{
    width:100%;
    height:800px;
    background:#fffbf4;
}
.so{
    width:100%;
    height:40px;
}
main .button{
    width:60px;
    height:40px;
    float:left;
    text-align:center;
    line-height:40px;
    background:orange;
}
main .button p{
    color:white;
}
main .all{
    width:100%;
    height:500px;
    margin-top:10px;
}
main .all li{
    margin-bottom:4px;
}
/***************main style***************/
>>>>>>> ba23b36d13648be6805e6ab3770f5b9542927c76
